From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Mon, 26 Feb 2018 18:19:26 +0000 (+0300)
Subject: Revert "Seperate licenses with a `/`"
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~2^2~80^2
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=e3eb2868d8fc4afb77a328b4beaefa459806e58f;p=cargo.git

Revert "Seperate licenses with a `/`"

This reverts commit 1ddba76a0f5f83884d20be97f49452f9dd1897f1.

OR is the more modern form
---

diff --git a/Cargo.toml b/Cargo.toml
index bcb74f255..eef7aae39 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.27.0"
 authors = ["Yehuda Katz <wycats@gmail.com>",
            "Carl Lerche <me@carllerche.com>",
            "Alex Crichton <alex@alexcrichton.com>"]
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 homepage = "https://crates.io"
 repository = "https://github.com/rust-lang/cargo"
 documentation = "https://docs.rs/cargo"
@@ -91,4 +91,4 @@ doc = false
 
 [[test]]
 name = "testsuite"
-path = "tests/testsuite/lib.rs"
+path = "tests/testsuite/lib.rs"
\ No newline at end of file